switch: Drop separate handling for US

The switches no longer use ON/OFF or o/|, so just use the
same class and artwork everywhere.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/496

diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
index b77825414bab3402e573dd55f7598e83715114b3..c05be6b424eab4ffff8476b2bd4cbf151f63c733 100644 (file)
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -21,10 +21,8 @@
     <file>noise-texture.png</file>
     <file>pad-osd.css</file>
     <file>process-working.svg</file>
-    <file>toggle-off-us.svg</file>
     <file>toggle-off-intl.svg</file>
     <file>toggle-off-hc.svg</file>
-    <file>toggle-on-us.svg</file>
     <file>toggle-on-intl.svg</file>
     <file>toggle-on-hc.svg</file>
   </gresource>

diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index 2d4800737838cea2045550638bc2575989442709..a6357baad4968a34c22e580ceae6386341137b56 100644 (file)
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -160,15 +160,10 @@ StScrollBar {
   width: 46px;
   height: 22px;
   background-size: contain;
+  background-image: url("resource:///org/gnome/shell/theme/toggle-off-intl.svg");
+  &:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-intl.svg"); }
 }
 
-  @each $v in us, intl {
-    .toggle-switch-#{$v} {
-      background-image: url("resource:///org/gnome/shell/theme/toggle-off-#{$v}.svg");
-      &:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-#{$v}.svg"); }
-    }
-  }
-
 /* links */
 .shell-link {
   color: $link_color;

diff --git a/data/theme/toggle-off-us.svg b/data/theme/toggle-off-us.svg
deleted file mode 120000 (symlink)
index ce8d08f..0000000
--- a/data/theme/toggle-off-us.svg
+++ /dev/null
@@ -1 +0,0 @@
-toggle-off-intl.svg
\ No newline at end of file

diff --git a/data/theme/toggle-on-us.svg b/data/theme/toggle-on-us.svg
deleted file mode 120000 (symlink)
index 1e501b6..0000000
--- a/data/theme/toggle-on-us.svg
+++ /dev/null
@@ -1 +0,0 @@
-toggle-on-intl.svg
\ No newline at end of file

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 283934c2878eecff8875adcf4b76d09fbde9f563..44818533ab904404c2ccf931a7f6128b0f61d5aa 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -277,12 +277,6 @@ var Switch = class {
         this.actor = new St.Bin({ style_class: 'toggle-switch',
                                   accessible_role: Atk.Role.CHECK_BOX,
                                   can_focus: true });
-        // Translators: this MUST be either "toggle-switch-us"
-        // (for toggle switches containing the English words
-        // "ON" and "OFF") or "toggle-switch-intl" (for toggle
-        // switches containing "◯" and "|"). Other values will
-        // simply result in invisible toggle switches.
-        this.actor.add_style_class_name(_("toggle-switch-us"));
         this.setToggleState(state);
     }